V1 Automation #101

anttix · 2019-12-24T11:26:07Z

No description provided.

jeffeb3

I am half distracted ATM. I want to check this out on my computer and poke around with it. I'm really not sure how, for example, we would make the releases for the latest 2.0.1 release.

I am super happy about this though. This is going to really increase the quality.

jeffeb3 · 2019-12-24T15:38:42Z

.github/workflows/v1-builds.yml

+      run: |
+        v1-scripts/fetch-branch "origin/$BUILD_BRANCH"
+        git fetch --prune origin "$MIRROR_BRANCH" # We need full history of the mirror branch
+        git branch $MIRROR_BRANCH origin/$MIRROR_BRANCH


I might not be getting the order here, but should this be fetching from upstream?

N/M, I see the pull action at 15 */6

jeffeb3 · 2019-12-24T15:50:52Z

.github/workflows/v1-builds.yml

+    - name: Push
+      if: github.event_name != 'pull_request'
+      run: |
+        git push origin "$BUILD_BRANCH:refs/heads/$BUILD_BRANCH" --force


Maybe I don't understand what this is doing...

jeffeb3 · 2019-12-24T15:55:48Z

.github/workflows/v1-builds.yml

+        #bodyFile: "body.md"
+        token: ${{ secrets.GITHUB_TOKEN }}
+        prerelease: true
+        name: unstable


So this will always go to the same release, right? There won't be a way to get a previous unstable branch?

Are these build products also available in the build log?

I'm not too happy with existing release plugins. It starts to look like we may have to build one.

In principle one can upload artifacts from build steps that can then be downloaded from the steps. But this is difficult to find/use and it's not designed for long-term storage.

If there is a need to keep a longer history of nightlies these must be published as releases. Which means there must be some cleanup logic to prune these.

jeffeb3 · 2019-12-24T16:04:23Z

v1-scripts/pull-from-upstream

+MIRROR_BRANCH="${MIRROR_BRANCH:-$UPSTREAM_BRANCH}"
+ORIGIN_REMOTE_NAME="${ORIGIN_REMOTE_NAME:-origin}"
+
+PULL_REQUESTS="${PULL_REQUESTS:-16108 16229}"


Interesting.

These have been merged, so we can get rid of these, right?

This will also only work for PRs against bugfix, otherwise, it will merge stuff not in the PR.

Yeah, these are not needed any more. I keep these around to test the concept.

jeffeb3 · 2019-12-24T16:06:01Z

v1-scripts/pull-from-upstream

+
+UPSTREAM_REPOSITORY="${UPSTREAM_REPOSITORY:-https://github.com/MarlinFirmware/Marlin.git}"
+UPSTREAM_REMOTE_NAME="${UPSTREAM_REMOTE_NAME:-upstream}"
+UPSTREAM_BRANCH="${UPSTREAM_BRANCH:-$UPSTREAM_REMOTE_NAME/bugfix-2.0.x}"


This could be an argument, to support picking this branch from upstream. I think 2.0.x is probably more useful for us, but bugfix is also useful.

Oh, it is. Because of the '=-'. Got it.

jeffeb3 · 2019-12-24T16:16:25Z

v1-scripts/generate-configs

@@ -0,0 +1,22 @@
+#!/bin/bash


I love this step!

jeffeb3 · 2019-12-24T16:21:57Z

v1-scripts/generate-build-branch

+MIRROR_BRANCH="${MIRROR_BRANCH:-bugfix-2.0.x}"
+MACHINES_BRANCH="${MACHINES_BRANCH:-HEAD}"
+BUILD_BRANCH="${BUILD_BRANCH:-v1-$MIRROR_BRANCH}"
+ADD_BRANCHES="${ADD_BRANCHES:-v1-base-config}"


This v1-base-config has to always be based on a common parent, or it will pull inextra stuff, right? I still have this idea in my head that bugfix and releases are not organized well upstream. Not sure how to fix that though.

What if v1-base-config was a submodule (or even just a nested checkout during build).

The point of these branches is to carry code that needs to be merged in but upstream will not carry. Think about backports of our PR-s that make it work/build on 2.0.x. These are present in bugfix-2.0.x and will be eventually in 2.0.1 but until that happens, backports need to be stored somewhere.

The v1-base-config branch right now is a test of two concepts: Starting with a "base" config that we (hopefully) push to upsteam and this branch merging logic.

jeffeb3 · 2019-12-24T16:31:45Z

v1-scripts/configs/ZenXY/Ramps_16T_LCD_32

+. $incdir/drv8825
+
+opt_set DEFAULT_AXIS_STEPS_PER_UNIT "{ 200, 200, 800, 200 }"
+opt_enable REVERSE_ENCODER_DIRECTION


I think reverse encoder direction should probably be the same on all the LCD configs. I'm guessing there is an error in the configs that causes this to only be on some setups.

This probably should be put next to the disolay enable feature, which looks like it is in the base configs.

jeffeb3 · 2019-12-24T16:34:42Z

v1-scripts/configs/MPCNC/SKR1.3_T8_16T_LCD_32step_DualEndstop

+
+incdir=$(dirname $0)/..
+
+use_example_configs CNC/MPCNC


You don't want this, do you? This is going to have a chicken and egg problem.

Or is this just copying the _Bootscreen?

This copies the entire config/examples/CNC/MPCNC directory.

jeffeb3 · 2019-12-24T16:37:56Z

v1-scripts/configs/MPCNC/Rambo_T8_16T_LCD_DualEndstop

+
+opt_enable REVERSE_ENCODER_DIRECTION
+
+# Why?


No idea. Probably just not as obvious as it is here.

I have no idea if I did this right but I am getting closer to finishing up all the new firmware and these are the settings I am using. Trying to keep my note in a public place, work in progress https://docs.google.com/spreadsheets/d/1vqvdtS2TFGz9YddYO6rAU1w7-0tvp0B9ObIfAOfCKvs/edit?usp=sharing

…oved)

Github doesn't allow automated pushes when workflows are present. ! [remote rejected] HEAD -> v1-bugfix-2.0.x (refusing to allow a bot to create or update workflow `.github/workflows/test-builds.yml`)

anttix force-pushed the v1-machines-demo branch from 1dd8dd8 to fee18c7 Compare December 24, 2019 11:30

Antti Andreimann added 2 commits December 24, 2019 05:30

Add V1 workflows

86e17bf

Add SKR 1.3 dual endstop version

fee18c7

jeffeb3 approved these changes Dec 24, 2019

View reviewed changes

Antti Andreimann added 4 commits December 24, 2019 13:08

Make config generation errors fatal

891eef0

Fix local usage of v1-scripts/pull-from-upstream

a33b58d

Fix PIO environment for Rambo boards

eadd73a

Move Marlin to a git sub-module

6c23395

anttix force-pushed the v1-machines-demo branch from 4f62033 to 6c23395 Compare December 27, 2019 05:11

Antti Andreimann and others added 7 commits December 29, 2019 00:23

Add a dual endstop config for SKR Pro 1.1

db6541f

Add configs for 2.0.x and dev-2.1.x branches

a18338d

Add readme and provide double check in script

3870c5d

Enable helical plunge with arcs (P circles) and CNC workplanes

7c6e897

Remove already merged PRs from bugfix-2.0.x build

9a16712

Ditch the hand-edited base config and switch to 100% generated

1f37638

anttix force-pushed the v1-machines-demo branch from 5989139 to 1f37638 Compare February 10, 2020 02:13

Antti Andreimann added 3 commits February 9, 2020 20:14

Correct stepper type for Archim2 board

68d904e

Fix build error with latest upstream (build_marlin_pio script was rem…

f95f998

…oved)

Delete upstream workflows on pull

42ccd27

Github doesn't allow automated pushes when workflows are present. ! [remote rejected] HEAD -> v1-bugfix-2.0.x (refusing to allow a bot to create or update workflow `.github/workflows/test-builds.yml`)

anttix force-pushed the v1-machines-demo branch from a7173ae to 42ccd27 Compare February 10, 2020 03:04

Antti Andreimann added 2 commits February 9, 2020 21:24

Handle fallout from upstream's config repository split

bba1ac8

Rename dual-endstops to dual-drivers-on-xy

8c744cc

anttix force-pushed the v1-machines-demo branch from 6b39358 to 8c744cc Compare February 10, 2020 03:25

Antti Andreimann added 4 commits February 9, 2020 21:38

Update BTT board names

790112d

Added single-axis config for SKR1.3

ef749ac

Added SKR1.3 configuration for Lowrider dual driver setup

0badd3a

Rename megaatmega2560 to mega2560 to accomodate upstream changes

8937e6d

anttix force-pushed the v1-machines-demo branch from e837640 to 8937e6d Compare May 25, 2020 16:38

Add TMC2209 support and sensorless config for SKR1.3 lowrider

99b7df6

Antti Andreimann added 3 commits July 30, 2020 22:02

Add support for TMC5160 drivers

a2c5fed

Publish an STL for Lowrider2 sensorless Z- homing

1ece46c

Publish Coupling saver STL

e06c3de

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

V1 Automation #101

V1 Automation #101

anttix commented Dec 24, 2019

jeffeb3 left a comment

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

anttix Dec 24, 2019

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

anttix Dec 25, 2019

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

anttix Dec 24, 2019 •

edited

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

jeffeb3 Dec 24, 2019

anttix Dec 24, 2019

jeffeb3 Dec 24, 2019


		incdir=$(dirname $0)/..

		use_example_configs CNC/MPCNC

V1 Automation #101

Are you sure you want to change the base?

V1 Automation #101

Conversation

anttix commented Dec 24, 2019

jeffeb3 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anttix Dec 24, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anttix Dec 24, 2019 •

edited